Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 18:20:05 +0000 (10:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Feb 2012 18:20:05 +0000 (10:20 -0800)

Trivial merge